General cleanup, move layout and styles css where it belong