fixed routing issues  fixed layout