Added title and some design fixes