Changed General Format of App