Remove verse feature, improved layout