Added hacks and improved layout