Updated UI, configuring layout and improving readability.