Upload Two

Fix some CSS issue, add some functionality.