New UI components and fixed main layout