Refactored to use a table for aligning widgets