Updated with thoughts on responsive design