Fix Layout issues on github