changed final names and layout