Optimized some margin and size issues for the device

Also trying to fix the image problem.

Commit 3