Restructuring and further styling