Bugfixes and Optimization of layouts

Signed-off-by : Arnav Gupta <dev@championswimmer.in>