Improved layout; fixed bug with settings.