Last fixes and improvements. UI Should be ready!