Fixing application layout, removing hive