Added layout and static stuff