added features and polished the layouts