Removed library and layout overhaul