Code cleanup
Fix transparent background issue when the alternative layout is activated
Added support for spacer items