Cleaned up UI templates