Adding Grid layout and filters
Remove un-necessory files