Minor changes on desing