Updated layouts and reformatted code.