Finishing basic layout and sing-up
Master in sync with branches.