Edited my html and layouts