[TASK] Layout changes and removed unused template