Some minor design changes
minor desing changes