Cleaned code, improved views