A bit of changes and everything is looking much more better now