realigned and updated layout