Added TODO
Removed layout view dependencies