[TASK] Minor fixes for better layout & routing